bitkeeper revision 1.1306 (42604119SDlzs7R1nEPCLSovtVOJ7A)

Merge freefall.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk

diff --cc linux-2.6.11-xen-sparse/include/asm-xen/evtchn.h
Simple merge

diff --cc tools/misc/xend
index 6360a35aeb2137d0c51def3c07dc2f735fc38fb5,a73ca579a81adea30866e6034d99a9feccf54767..57fbe14567fefdb9fda67fa9974685fd9f22cc01
--- 1/tools/misc/xend
--- 2/tools/misc/xend
+++ b/tools/misc/xend
@@@ -21,17 -21,9 +21,17 @@@
  """
  import os
  import sys
 +import socket
 +import signal
 +import time
 +
 +XCS_PATH    = "/var/lib/xen/xcs_socket"
 +XCS_EXEC    = "/usr/sbin/xcs"
 +XCS_PIDFILE = "/var/run/xcs.pid"
 +XCS_ARGS    = (XCS_EXEC, "-p", XCS_PIDFILE)
  
- # Default install path for Xen binary packages.
- sys.path = [ '/usr/lib/python' ] + sys.path
+ # add fallback path for non-native python path installs if needed
+ sys.path.append('/usr/lib/python')
  from xen.xend.server import SrvDaemon
  
  class CheckError(ValueError):

diff --cc tools/xentrace/Makefile
Simple merge

diff --cc xen/Makefile
Simple merge